[Core] Fix Race Conditions in CMsgSubscriber #1324
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Properly implement destructor (in inherited classes)! -> Destroy may not be called in base CMsgSubscriber class as this can lead to stack unwinding (most likely causes an exception in destructor, or leads to already deleted functions of derived class being called when they are already deleted) - Correct order of RemReceiveCallback and resetting internal pointer - protect function pointer with mutex. - Make testcase "harder" to more easily trigger race conditions.
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| @@ -125,7 +125,8 @@ namespace eCAL | |||
| return *this; | |||
| } | |||
|
|
|||
| virtual ~CMsgSubscriber() {} | |||
| virtual ~CMsgSubscriber() | |||
There was a problem hiding this comment.
warning: use '= default' to define a trivial destructor [modernize-use-equals-default]
ecal/core/include/ecal/msg/subscriber.h:128:
- {}
+ = default;| @@ -219,9 +223,12 @@ namespace eCAL | |||
| **/ | |||
| bool RemReceiveCallback() | |||
| { | |||
| bool ret = CSubscriber::RemReceiveCallback(); | |||
There was a problem hiding this comment.
warning: variable 'ret' is not initialized [cppcoreguidelines-init-variables]
Suggested change
| bool ret = CSubscriber::RemReceiveCallback(); | |
| bool ret = false = CSubscriber::RemReceiveCallback(); |
| @@ -245,7 +252,11 @@ namespace eCAL | |||
| private: | |||
| void ReceiveCallback(const char* topic_name_, const struct eCAL::SReceiveCallbackData* data_) | |||
| { | |||
| MsgReceiveCallbackT fn_callback(m_cb_callback); | |||
| MsgReceiveCallbackT fn_callback; | |||
There was a problem hiding this comment.
warning: variable 'fn_callback' is not initialized [cppcoreguidelines-init-variables]
Suggested change
| MsgReceiveCallbackT fn_callback; | |
| MsgReceiveCallbackT fn_callback = 0; |
|
Fixes #1318 |
| @@ -245,7 +251,11 @@ namespace eCAL | |||
| private: | |||
| void ReceiveCallback(const char* topic_name_, const struct eCAL::SReceiveCallbackData* data_) | |||
| { | |||
| MsgReceiveCallbackT fn_callback(m_cb_callback); | |||
| MsgReceiveCallbackT fn_callback = nullptr; | |||
There was a problem hiding this comment.
warning: variable 'fn_callback' is not initialized [cppcoreguidelines-init-variables]
Suggested change
| MsgReceiveCallbackT fn_callback = nullptr; | |
| MsgReceiveCallbackT fn_callback = 0 = nullptr; |
FlorianReimold
approved these changes
Jan 22, 2024
KerstinKeller
added a commit
that referenced
this pull request
Jan 25, 2024
- Properly implement destructor (in inherited classes)! -> Destroy may not be called in base CMsgSubscriber class as this can lead to stack unwinding (most likely causes an exception in destructor, or leads to already deleted functions of derived class being called when they are already deleted) - Correct order of RemReceiveCallback and resetting internal pointer - protect function pointer with mutex. - Make testcase "harder" to more easily trigger race conditions.
KerstinKeller
added a commit
that referenced
this pull request
Jan 25, 2024
- Properly implement destructor (in inherited classes)! -> Destroy may not be called in base CMsgSubscriber class as this can lead to stack unwinding (most likely causes an exception in destructor, or leads to already deleted functions of derived class being called when they are already deleted) - Correct order of RemReceiveCallback and resetting internal pointer - protect function pointer with mutex. - Make testcase "harder" to more easily trigger race conditions.
FlorianReimold
pushed a commit
that referenced
this pull request
Jan 26, 2024
- Properly implement destructor (in inherited classes)! -> Destroy may not be called in base CMsgSubscriber class as this can lead to stack unwinding (most likely causes an exception in destructor, or leads to already deleted functions of derived class being called when they are already deleted) - Correct order of RemReceiveCallback and resetting internal pointer - protect function pointer with mutex. - Make testcase "harder" to more easily trigger race conditions.
FlorianReimold
pushed a commit
that referenced
this pull request
Jan 26, 2024
- Properly implement destructor (in inherited classes)! -> Destroy may not be called in base CMsgSubscriber class as this can lead to stack unwinding (most likely causes an exception in destructor, or leads to already deleted functions of derived class being called when they are already deleted) - Correct order of RemReceiveCallback and resetting internal pointer - protect function pointer with mutex. - Make testcase "harder" to more easily trigger race conditions.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-pick to